cleanup: Use non-deprecated key symbols

Clutter originally cluttered its namespace with key symbols, before
prefixing all symbols with KEY. We still use the unprefixed symbols
occasionally, replace them so mutter can drop the deprecated symbols.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/808

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index c2d3760a2bfe5064cd53913c71d7a84dfd9173cc..e81199dc83feb3a3e83e47d2a4c567e0a8a617c1 100644 (file)
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -180,25 +180,25 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
             this._select(this._next());
         } else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD) {
             this._select(this._previous());
-        } else if (keysym == Clutter.q) {
+        } else if (keysym === Clutter.KEY_q) {
             this._quitApplication(this._selectedIndex);
         } else if (this._thumbnailsFocused) {
-            if (keysym == Clutter.Left)
+            if (keysym === Clutter.KEY_Left)
                 this._select(this._selectedIndex, this._previousWindow());
-            else if (keysym == Clutter.Right)
+            else if (keysym === Clutter.KEY_Right)
                 this._select(this._selectedIndex, this._nextWindow());
-            else if (keysym == Clutter.Up)
+            else if (keysym === Clutter.KEY_Up)
                 this._select(this._selectedIndex, null, true);
-            else if (keysym == Clutter.w || keysym == Clutter.F4)
+            else if (keysym === Clutter.KEY_w || keysym === Clutter.KEY_F4)
                 this._closeAppWindow(this._selectedIndex, this._currentWindow);
             else
                 return Clutter.EVENT_PROPAGATE;
         } else {
-            if (keysym == Clutter.Left)
+            if (keysym === Clutter.KEY_Left)
                 this._select(this._previous());
-            else if (keysym == Clutter.Right)
+            else if (keysym === Clutter.KEY_Right)
                 this._select(this._next());
-            else if (keysym == Clutter.Down)
+            else if (keysym === Clutter.KEY_Down)
                 this._select(this._selectedIndex, 0);
             else
                 return Clutter.EVENT_PROPAGATE;
@@ -596,11 +596,11 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
         } else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD) {
             this._select(this._previous());
         } else {
-            if (keysym == Clutter.Left)
+            if (keysym === Clutter.KEY_Left)
                 this._select(this._previous());
-            else if (keysym == Clutter.Right)
+            else if (keysym === Clutter.KEY_Right)
                 this._select(this._next());
-            else if (keysym == Clutter.w || keysym == Clutter.F4)
+            else if (keysym === Clutter.KEY_w || keysym === Clutter.KEY_F4)
                 this._closeWindow(this._selectedIndex);
             else
                 return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index cb08acceafc4239c4c49add68dea497ab84ec451..f9706aa2ebe19bf29f37ad460513de9113cb9b33 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -660,10 +660,10 @@ var AllView = GObject.registerClass({
         if (this._displayingPopup)
             return Clutter.EVENT_STOP;
 
-        if (event.get_key_symbol() == Clutter.Page_Up) {
+        if (event.get_key_symbol() === Clutter.KEY_Page_Up) {
             this.goToPage(this._grid.currentPage - 1);
             return Clutter.EVENT_STOP;
-        } else if (event.get_key_symbol() == Clutter.Page_Down) {
+        } else if (event.get_key_symbol() === Clutter.KEY_Page_Down) {
             this.goToPage(this._grid.currentPage + 1);
             return Clutter.EVENT_STOP;
         }
@@ -1960,18 +1960,18 @@ var AppFolderPopup = GObject.registerClass({
         let direction;
         let isLtr = Clutter.get_default_text_direction() == Clutter.TextDirection.LTR;
         switch (keyEvent.keyval) {
-        case Clutter.Down:
+        case Clutter.KEY_Down:
             direction = St.DirectionType.TAB_FORWARD;
             break;
-        case Clutter.Right:
+        case Clutter.KEY_Right:
             direction = isLtr
                 ? St.DirectionType.TAB_FORWARD
                 : St.DirectionType.TAB_BACKWARD;
             break;
-        case Clutter.Up:
+        case Clutter.KEY_Up:
             direction = St.DirectionType.TAB_BACKWARD;
             break;
-        case Clutter.Left:
+        case Clutter.KEY_Left:
             direction = isLtr
                 ? St.DirectionType.TAB_BACKWARD
                 : St.DirectionType.TAB_FORWARD;

diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js
index ba7d1e9fe0b41806fefa8dd65ecc5194b6c318a6..f8c8ea6baf9a45532a5fff68c4c940d4a80275cb 100644 (file)
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -54,7 +54,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
                              label: _("Sound Settings") });
         this.addButton({ action: this.close.bind(this),
                          label: _("Cancel"),
-                         key: Clutter.Escape });
+                         key: Clutter.KEY_Escape });
     }
 
     _getDeviceLabel(device) {

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index 5cbeb9c5cb816588c6c6937f3229d3479f9113a8..4d43196ba6cf03fc2dc6bb230b5665451835d7ef 100644 (file)
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -73,7 +73,7 @@ var CloseDialog = GObject.registerClass({
                                  default: true });
         this._dialog.addButton({ label: _('Wait'),
                                  action: this._onWait.bind(this),
-                                 key: Clutter.Escape });
+                                 key: Clutter.KEY_Escape });
 
         global.focus_manager.add_group(this._dialog);
 

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index f32a46210393041f3e768d56d0a0f97aca8bb498..429fbce80d8bd7e3fdc5296df796e33738322935 100644 (file)
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -33,7 +33,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
 
         this._cancelButton = this.addButton({ label: '',
                                               action: this._onCancelButton.bind(this),
-                                              key: Clutter.Escape });
+                                              key: Clutter.KEY_Escape });
         this._continueButton = this.addButton({ label: '',
                                                 action: this._onContinueButton.bind(this),
                                                 default: true });

diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 1a11c0b7eb5108c3c0c91d14134a997dd4ab6a64..8759400ef3b183dcdc184cc147590e25fbe4d52c 100644 (file)
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -136,7 +136,7 @@ var AuthenticationDialog = GObject.registerClass({
 
         this._cancelButton = this.addButton({ label: _("Cancel"),
                                               action: this.cancel.bind(this),
-                                              key: Clutter.Escape });
+                                              key: Clutter.KEY_Escape });
         this._okButton = this.addButton({ label: _("Authenticate"),
                                           action: this._onAuthenticateButtonPressed.bind(this),
                                           reactive: false });

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index f765d529c59c6c9a806ed9c7d56bd593ddd70b18..cb7e4cd6919298500d1aa2b98040a1d4aff983fc 100644 (file)
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -143,9 +143,9 @@ class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
             this._select(this._next());
         else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
             this._select(this._previous());
-        else if (keysym == Clutter.Left)
+        else if (keysym == Clutter.KEY_Left)
             this._select(this._previous());
-        else if (keysym == Clutter.Right)
+        else if (keysym == Clutter.KEY_Right)
             this._select(this._next());
         else
             return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 6fff86b251dade3a5d1e6b6ee7954a6280a0056d..2ec939740d6681d7a2527b28f070140776e31f90 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -267,7 +267,7 @@ var _Draggable = class _Draggable {
         // dragging and ignore all other key presses.
         } else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragState == DragState.DRAGGING) {
             let symbol = event.get_key_symbol();
-            if (symbol == Clutter.Escape) {
+            if (symbol == Clutter.KEY_Escape) {
                 this._cancelDrag(event.get_time());
                 return Clutter.EVENT_STOP;
             }

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index fc5440eb7266f960f380a3e80bebfa0e62fb6c90..319e8c764d7beeca5c17875da7f1e9d31c9802cf 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -443,7 +443,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         let dialogContent = DialogContent[this._type];
         let buttons = [{ action: this.cancel.bind(this),
                          label: _("Cancel"),
-                         key: Clutter.Escape }];
+                         key: Clutter.KEY_Escape }];
 
         for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
             let signal = dialogContent.confirmButtons[i].signal;

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index dc3f1d566d58cb6a1919232e0118059ecfe46959..a19aa832be7b86c975088a77f6230b3d5d73baa9 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -189,7 +189,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
         this.setButtons([{
             label: _("Cancel"),
             action: this._onCancelButtonPressed.bind(this),
-            key: Clutter.Escape,
+            key: Clutter.KEY_Escape,
         }, {
             label: _("Install"),
             action: this._onInstallButtonPressed.bind(this),

diff --git a/js/ui/kbdA11yDialog.js b/js/ui/kbdA11yDialog.js
index f5ffccce7cefbb2e3111bc1f7e3538601e571bbe..877c4327adfe8a3e045eeddd462311a91acefb21 100644 (file)
--- a/js/ui/kbdA11yDialog.js
+++ b/js/ui/kbdA11yDialog.js
@@ -61,7 +61,7 @@ class KbdA11yDialog extends GObject.Object {
                                dialog.close();
                            },
                            default: enabled,
-                           key: !enabled ? Clutter.Escape : null });
+                           key: !enabled ? Clutter.KEY_Escape : null });
 
         dialog.addButton({ label: enabled ? _("Turn Off") : _("Leave Off"),
                            action: () => {
@@ -69,7 +69,7 @@ class KbdA11yDialog extends GObject.Object {
                                dialog.close();
                            },
                            default: !enabled,
-                           key: enabled ? Clutter.Escape : null });
+                           key: enabled ? Clutter.KEY_Escape : null });
 
         dialog.open();
     }

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 87f2aa04cd4b70a0078e0d4ffa9ece48a4f3e32f..284282c787e8e674072fa006e97d9d91ee290707 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -81,7 +81,7 @@ var AutoComplete = class AutoComplete {
         if (cursorPos != -1) {
             text = text.slice(0, cursorPos);
         }
-        if (event.get_key_symbol() == Clutter.Tab) {
+        if (event.get_key_symbol() === Clutter.KEY_Tab) {
             let [completions, attrHead] = JsParse.getCompletions(text, commandHeader, AUTO_COMPLETE_GLOBAL_KEYWORDS);
             let currTime = global.get_current_time();
             if ((currTime - this._lastTabTime) < AUTO_COMPLETE_DOUBLE_TAB_DELAY) {
@@ -565,7 +565,7 @@ var Inspector = GObject.registerClass({
     }
 
     _onKeyPressEvent(actor, event) {
-        if (event.get_key_symbol() == Clutter.Escape)
+        if (event.get_key_symbol() === Clutter.KEY_Escape)
             this._close();
         return Clutter.EVENT_STOP;
     }
@@ -1096,7 +1096,7 @@ class LookingGlass extends St.BoxLayout {
     // Handle key events which are relevant for all tabs of the LookingGlass
     vfunc_key_press_event(keyPressEvent) {
         let symbol = keyPressEvent.keyval;
-        if (symbol == Clutter.Escape) {
+        if (symbol === Clutter.KEY_Escape) {
             if (this._objInspector.visible) {
                 this._objInspector.close();
             } else {

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 75e274f33fe7c30a13977ee83dcb2700f11a9520..4b8d1d76d585d0aaa68c732076b5873b39acd8ca 100644 (file)
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -797,7 +797,7 @@ var PadOsd = GObject.registerClass({
             this._padDiagram.deactivateButton(event.get_button());
             return Clutter.EVENT_STOP;
         } else if (event.type() == Clutter.EventType.KEY_PRESS &&
-                   (!this._editionMode || event.get_key_symbol() == Clutter.Escape)) {
+                   (!this._editionMode || event.get_key_symbol() === Clutter.KEY_Escape)) {
             if (this._editedAction != null)
                 this._endActionEdition();
             else

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 8154b94273e1fe90b5b2f76e0e393f8bfaa5c3f8..edb9bc9ca9454c423ea4cd8bf8eaacefcda1f237 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -95,7 +95,7 @@ class RunDialog extends ModalDialog.ModalDialog {
         this.setButtons([{
             action: this.close.bind(this),
             label: _("Close"),
-            key: Clutter.Escape,
+            key: Clutter.KEY_Escape,
         }]);
 
         this._pathCompleter = new Gio.FilenameCompleter();
@@ -112,7 +112,7 @@ class RunDialog extends ModalDialog.ModalDialog {
         });
         this._entryText.connect('key-press-event', (o, e) => {
             let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Tab) {
+            if (symbol === Clutter.KEY_Tab) {
                 let text = o.get_text();
                 let prefix;
                 if (text.lastIndexOf(' ') == -1)

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 968205a458a8b34059eea8d59f18a66ef8de2142..f8bda055f74aecf53f8e99a8539bcf1e7ce35077 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -394,7 +394,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
         this._defaultButtons = [{
             label: _("Cancel"),
             action: this._onCancelButton.bind(this),
-            key: Clutter.Escape,
+            key: Clutter.KEY_Escape,
         }, {
             label: _("Unlock"),
             action: this._onUnlockButton.bind(this),
@@ -404,7 +404,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
         this._usesKeyfilesButtons = [{
             label: _("Cancel"),
             action: this._onCancelButton.bind(this),
-            key: Clutter.Escape,
+            key: Clutter.KEY_Escape,
         }, {
             /* Translators: %s is the Disks application */
             label: _("Open %s").format(disksApp.get_name()),

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index f378170774384b61788a790cd52f3db3fea2b49a..d6423e5ab5897883f7cf711792a2f978ef4014c3 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -87,9 +87,9 @@ class InputSourcePopup extends SwitcherPopup.SwitcherPopup {
             this._select(this._next());
         else if (action == this._actionBackward)
             this._select(this._previous());
-        else if (keysym == Clutter.Left)
+        else if (keysym == Clutter.KEY_Left)
             this._select(this._previous());
-        else if (keysym == Clutter.Right)
+        else if (keysym == Clutter.KEY_Right)
             this._select(this._next());
         else
             return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index c5643f03b9cfec4b8756ea45d2f46f3be3b00855..b7e36c87a7a763f8ab376bc0e0040fe34f4b4eb0 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -908,10 +908,10 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
 
         this._disconnectButton = this.addButton({ action: this.close.bind(this),
                                                   label: _("Cancel"),
-                                                  key: Clutter.Escape });
+                                                  key: Clutter.KEY_Escape });
         this._connectButton = this.addButton({ action: this._connect.bind(this),
                                                label: _("Connect"),
-                                               key: Clutter.Return });
+                                               key: Clutter.KEY_Return });
     }
 
     _connect() {

diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
index a53e06033a1bd59ea0e238bc44f4ccf9d99fcf67..ded8c49c029fd001c0b2358812741bd9dec99dd5 100644 (file)
--- a/js/ui/switchMonitor.js
+++ b/js/ui/switchMonitor.js
@@ -52,9 +52,9 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup {
     _keyPressHandler(keysym, action) {
         if (action == Meta.KeyBindingAction.SWITCH_MONITOR)
             this._select(this._next());
-        else if (keysym == Clutter.Left)
+        else if (keysym == Clutter.KEY_Left)
             this._select(this._previous());
-        else if (keysym == Clutter.Right)
+        else if (keysym == Clutter.KEY_Right)
             this._select(this._next());
         else
             return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index cc49ddf73f936c059bc3d81f8c4d9725d5bc927f..04c4d3337efa9be1b4f6bf061be1e361ac48e2d7 100644 (file)
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -172,7 +172,7 @@ var SwitcherPopup = GObject.registerClass({
 
         // Note: pressing one of the below keys will destroy the popup only if
         // that key is not used by the active popup's keyboard shortcut
-        if (keysym == Clutter.Escape || keysym == Clutter.Tab)
+        if (keysym === Clutter.KEY_Escape || keysym === Clutter.KEY_Tab)
             this.fadeAndDestroy();
 
         return Clutter.EVENT_STOP;

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 6b10ec600c1542932a005eff08956f3a7a88c8db..618dbd6df9bba9e2cc0774a07c97a45b7d2586d6 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -406,7 +406,7 @@ var ViewSelector = GObject.registerClass({
 
         let symbol = event.get_key_symbol();
 
-        if (symbol == Clutter.Escape) {
+        if (symbol === Clutter.KEY_Escape) {
             if (this._searchActive)
                 this.reset();
             else if (this._showAppsButton.checked)
@@ -417,10 +417,10 @@ var ViewSelector = GObject.registerClass({
         } else if (this._shouldTriggerSearch(symbol)) {
             this.startSearch(event);
         } else if (!this._searchActive && !global.stage.key_focus) {
-            if (symbol == Clutter.Tab || symbol == Clutter.Down) {
+            if (symbol === Clutter.KEY_Tab || symbol === Clutter.KEY_Down) {
                 this._activePage.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
                 return Clutter.EVENT_STOP;
-            } else if (symbol == Clutter.ISO_Left_Tab) {
+            } else if (symbol === Clutter.KEY_ISO_Left_Tab) {
                 this._activePage.navigate_focus(null, St.DirectionType.TAB_BACKWARD, false);
                 return Clutter.EVENT_STOP;
             }
@@ -485,10 +485,10 @@ var ViewSelector = GObject.registerClass({
     }
 
     _shouldTriggerSearch(symbol) {
-        if (symbol == Clutter.Multi_key)
+        if (symbol === Clutter.KEY_Multi_key)
             return true;
 
-        if (symbol == Clutter.BackSpace && this._searchActive)
+        if (symbol === Clutter.KEY_BackSpace && this._searchActive)
             return true;
 
         let unicode = Clutter.keysym_to_unicode(symbol);
@@ -541,7 +541,7 @@ var ViewSelector = GObject.registerClass({
 
     _onKeyPress(entry, event) {
         let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Escape) {
+        if (symbol === Clutter.KEY_Escape) {
             if (this._isActivated()) {
                 this.reset();
                 return Clutter.EVENT_STOP;
@@ -549,28 +549,28 @@ var ViewSelector = GObject.registerClass({
         } else if (this._searchActive) {
             let arrowNext, nextDirection;
             if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
-                arrowNext = Clutter.Left;
+                arrowNext = Clutter.KEY_Left;
                 nextDirection = St.DirectionType.LEFT;
             } else {
-                arrowNext = Clutter.Right;
+                arrowNext = Clutter.KEY_Right;
                 nextDirection = St.DirectionType.RIGHT;
             }
 
-            if (symbol == Clutter.Tab) {
+            if (symbol === Clutter.KEY_Tab) {
                 this._searchResults.navigateFocus(St.DirectionType.TAB_FORWARD);
                 return Clutter.EVENT_STOP;
-            } else if (symbol == Clutter.ISO_Left_Tab) {
+            } else if (symbol === Clutter.KEY_ISO_Left_Tab) {
                 this._focusTrap.can_focus = false;
                 this._searchResults.navigateFocus(St.DirectionType.TAB_BACKWARD);
                 this._focusTrap.can_focus = true;
                 return Clutter.EVENT_STOP;
-            } else if (symbol == Clutter.Down) {
+            } else if (symbol === Clutter.KEY_Down) {
                 this._searchResults.navigateFocus(St.DirectionType.DOWN);
                 return Clutter.EVENT_STOP;
             } else if (symbol == arrowNext && this._text.position == -1) {
                 this._searchResults.navigateFocus(nextDirection);
                 return Clutter.EVENT_STOP;
-            } else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
+            } else if (symbol === Clutter.KEY_Return || symbol === Clutter.KEY_KP_Enter) {
                 this._searchResults.activateDefault();
                 return Clutter.EVENT_STOP;
             }

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 5b33877418d900fcc550a68f9b14f17664a512c2..97f4ef8a98349107000d9ea9144e0cb77333b566 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -69,7 +69,7 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
         */
         this._cancelButton = this.addButton({ label: _("Revert Settings"),
                                               action: this._onFailure.bind(this),
-                                              key: Clutter.Escape });
+                                              key: Clutter.KEY_Escape });
         this._okButton = this.addButton({ label: _("Keep Changes"),
                                           action: this._onSuccess.bind(this),
                                           default: true });